Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

paplayer: avoid blocking in OpenFile, call QueueNextFile instead #4340

Merged
merged 1 commit into from Mar 8, 2014

Conversation

FernetMenta
Copy link
Contributor

fixes http://trac.xbmc.org/ticket/14987

Mainthread can't be blocked by MakeStream while AE waits for OnDisplayReset event.

@FernetMenta
Copy link
Contributor Author

jenkins build this please i know you are bored

@jmarshallnz
Copy link
Contributor

Would this not mean we lose the crossfade on twin streams thing completely as this is now non-blocking, so m_streams.size() will rarely be 2 (the job is unlikely to get very far along) ?

@FernetMenta
Copy link
Contributor Author

ah ok. it won't interrupt the playing stream any more. this needs another iteration ...

@FernetMenta
Copy link
Contributor Author

@jmarshallnz updated. only changes behavior if AE is suspended

@jmarshallnz
Copy link
Contributor

Is it obvious to the paplayer devs (assuming they exist) as to why it should be different, or is a comment in the code required?

@FernetMenta
Copy link
Contributor Author

a comment is always a good idea, will update

@FernetMenta
Copy link
Contributor Author

jenkins build this please

3 similar comments
@FernetMenta
Copy link
Contributor Author

jenkins build this please

@jmarshallnz
Copy link
Contributor

jenkins build this please

@FernetMenta
Copy link
Contributor Author

jenkins build this please

jmarshallnz added a commit that referenced this pull request Mar 8, 2014
paplayer: avoid blocking in OpenFile, call QueueNextFile instead
@jmarshallnz jmarshallnz merged commit 4cfbf83 into xbmc:master Mar 8, 2014
jmarshallnz added a commit that referenced this pull request Mar 9, 2014
paplayer: avoid blocking in OpenFile, call QueueNextFile instead
@jmarshallnz jmarshallnz removed the Gotham label Mar 9, 2014
@FernetMenta FernetMenta deleted the playlist branch March 9, 2014 10:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants